* xfns.c (Fx_open_connection): If we have X11R5, use

	XrmSetDatabase to set the display's database.  In older versions,
	just store the value into x_current_display->db.

diff --git a/src/xfns.c b/src/xfns.c
index cf55cc6c3e1a5ce354ec10f4b7879b253f6682e5..8d411508dcdbf0d9d3989ccec0779aff873c112f 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3756,7 +3756,11 @@ arg XRM_STRING is a string of resources in xrdb format.")
   else
     xrm_option = (unsigned char *) 0;
   xrdb = x_load_resources (x_current_display, xrm_option, EMACS_CLASS);
+#ifdef HAVE_X11R5
+  XrmSetDatabase (x_current_display, xrdb);
+#else
   x_current_display->db = xrdb;
+#endif
 
   x_screen = DefaultScreenOfDisplay (x_current_display);